From e4e32637495cdc3af6e1ff5eae3336c74f11911a Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Fri, 1 Sep 2006 11:20:48 -0600 Subject: [PATCH] [IA64] update buildconfigs This fixes the sparse tree buildconfigs to allow xenU to build automatically. There's no need to force netdev front/back on from the arch Kconfig file anymore. Based on patch from Akio Takebe & Yoshiro Fujita. Signed-off-by: Alex Williamson --- buildconfigs/linux-defconfig_xen0_ia64 | 8 ++++---- buildconfigs/linux-defconfig_xenU_ia64 | 6 +++--- buildconfigs/linux-defconfig_xen_ia64 | 8 ++++---- linux-2.6-xen-sparse/arch/ia64/Kconfig | 6 ------ 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/buildconfigs/linux-defconfig_xen0_ia64 b/buildconfigs/linux-defconfig_xen0_ia64 index b1f96f0dbd..24ce34546a 100644 --- a/buildconfigs/linux-defconfig_xen0_ia64 +++ b/buildconfigs/linux-defconfig_xen0_ia64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.13-xen0 -# Fri Jul 28 16:33:47 2006 +# Fri Sep 1 11:03:26 2006 # # @@ -1512,12 +1512,10 @@ CONFIG_HAVE_ARCH_ALLOC_SKB=y CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y CONFIG_XEN_BALLOON=y CONFIG_XEN_SKBUFF=y -CONFIG_XEN_NETDEV_BACKEND=y -CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_DEVMEM is not set CONFIG_XEN_REBOOT=y # CONFIG_XEN_SMPBOOT is not set -CONFIG_XEN_INTERFACE_VERSION=0x00030202 +CONFIG_XEN_INTERFACE_VERSION=0x00030203 # # XEN @@ -1529,6 +1527,7 @@ CONFIG_XEN_XENBUS_DEV=y CONFIG_XEN_BACKEND=y CONFIG_XEN_BLKDEV_BACKEND=y # CONFIG_XEN_BLKDEV_TAP is not set +CONFIG_XEN_NETDEV_BACKEND=y # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set CONFIG_XEN_NETDEV_LOOPBACK=y CONFIG_XEN_PCIDEV_BACKEND=y @@ -1538,6 +1537,7 @@ CONFIG_XEN_PCIDEV_BACKEND_SLOT=y # CONFIG_XEN_PCIDEV_BE_DEBUG is not set # CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_SCRUB_PAGES is not set CONFIG_XEN_DISABLE_SERIAL=y CONFIG_XEN_SYSFS=y diff --git a/buildconfigs/linux-defconfig_xenU_ia64 b/buildconfigs/linux-defconfig_xenU_ia64 index b448bd5ad2..dd0e4e29b6 100644 --- a/buildconfigs/linux-defconfig_xenU_ia64 +++ b/buildconfigs/linux-defconfig_xenU_ia64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.13-xenU -# Fri Jul 28 16:32:18 2006 +# Fri Sep 1 10:50:54 2006 # # @@ -1387,11 +1387,10 @@ CONFIG_HAVE_ARCH_ALLOC_SKB=y CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y CONFIG_XEN_BALLOON=y CONFIG_XEN_SKBUFF=y -CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_DEVMEM is not set CONFIG_XEN_REBOOT=y # CONFIG_XEN_SMPBOOT is not set -CONFIG_XEN_INTERFACE_VERSION=0x00030202 +CONFIG_XEN_INTERFACE_VERSION=0x00030203 # # XEN @@ -1402,6 +1401,7 @@ CONFIG_XEN_PRIVCMD=y CONFIG_XEN_XENBUS_DEV=y # CONFIG_XEN_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_SCRUB_PAGES is not set # CONFIG_XEN_DISABLE_SERIAL is not set CONFIG_XEN_SYSFS=y diff --git a/buildconfigs/linux-defconfig_xen_ia64 b/buildconfigs/linux-defconfig_xen_ia64 index 5a3f281440..2928e8a5c8 100644 --- a/buildconfigs/linux-defconfig_xen_ia64 +++ b/buildconfigs/linux-defconfig_xen_ia64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.13-xen -# Fri Jul 28 16:33:08 2006 +# Fri Sep 1 10:58:55 2006 # # @@ -1518,12 +1518,10 @@ CONFIG_HAVE_ARCH_ALLOC_SKB=y CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y CONFIG_XEN_BALLOON=y CONFIG_XEN_SKBUFF=y -CONFIG_XEN_NETDEV_BACKEND=y -CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_DEVMEM is not set CONFIG_XEN_REBOOT=y # CONFIG_XEN_SMPBOOT is not set -CONFIG_XEN_INTERFACE_VERSION=0x00030202 +CONFIG_XEN_INTERFACE_VERSION=0x00030203 # # XEN @@ -1535,6 +1533,7 @@ CONFIG_XEN_XENBUS_DEV=y CONFIG_XEN_BACKEND=y CONFIG_XEN_BLKDEV_BACKEND=y # CONFIG_XEN_BLKDEV_TAP is not set +CONFIG_XEN_NETDEV_BACKEND=y # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set CONFIG_XEN_NETDEV_LOOPBACK=y CONFIG_XEN_PCIDEV_BACKEND=y @@ -1544,6 +1543,7 @@ CONFIG_XEN_PCIDEV_BACKEND_SLOT=y # CONFIG_XEN_PCIDEV_BE_DEBUG is not set # CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_SCRUB_PAGES is not set CONFIG_XEN_DISABLE_SERIAL=y CONFIG_XEN_SYSFS=y diff --git a/linux-2.6-xen-sparse/arch/ia64/Kconfig b/linux-2.6-xen-sparse/arch/ia64/Kconfig index 0a21dbbed3..c32f4cee4c 100644 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig @@ -516,12 +516,6 @@ config XEN_BALLOON config XEN_SKBUFF default y -config XEN_NETDEV_BACKEND - default y - -config XEN_NETDEV_FRONTEND - default y - config XEN_DEVMEM default n -- 2.30.2